Don't add the same target atom twice. (#516087, Christian Persch)

2008-02-15  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkselection.c (gtk_target_list_add_text_targets): Don't
        add the same target atom twice.  (#516087, Christian Persch)

svn path=/trunk/; revision=19589

diff --git a/ChangeLog b/ChangeLog
index 304aaca377d237c9dff8bb1a86a2861988b64701..96dbcd00b09306f3f889364589cb920146fe4fde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkselection.c (gtk_target_list_add_text_targets): Don't
+       add the same target atom twice.  (#516087, Christian Persch)
+
 2008-02-15  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testfilechooser.c: Add a --backend option.

diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 5a419bcad9c3ea4b87f710a0ee01cf8438413cdc..bc9c41e42fc3cc566d7542e2b17bd74c79a4c8db 100644 (file)
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -338,7 +338,8 @@ gtk_target_list_add_text_targets (GtkTargetList *list,
   gtk_target_list_add (list, text_atom, 0, info);  
   gtk_target_list_add (list, GDK_TARGET_STRING, 0, info);  
   gtk_target_list_add (list, text_plain_utf8_atom, 0, info);  
-  gtk_target_list_add (list, text_plain_locale_atom, 0, info);  
+  if (!g_get_charset (NULL))
+    gtk_target_list_add (list, text_plain_locale_atom, 0, info);  
   gtk_target_list_add (list, text_plain_atom, 0, info);  
 }